README: cleanup, add an nmea type.

wintesto: regenerate.

diff --git a/gpsbabel/README b/gpsbabel/README
index 84cea124f42707fd74850e767c6172edef2325d4..d5444e9aae23dd232c23003c2484cb626845b64f 100644 (file)
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -465,23 +465,6 @@ THE FORMATS
        This is a catch-all used by many Delorme mapping products and
        reads the anr, rte, and rtd formats as either tracks or routes.
        
-<<<<<<< README
-    saplus
-
-        This format is for Street Atlas USA 2004 Plus.  
-
-        For geocachers importing data from a tool like GSAK or Spinner,
-        import the file twice in XData.  One will create a file with the
-        Cache description as a hyperlink on the flag.  This can clutter
-        up the screen and when you try to zoom in, it causes problems.
-        So the second one will only have a flag.  Thus you can turn off
-        and on which one you want to view.  The first time you import
-        the file, in the assign field types, check the circle above Full
-        Name and then next.  The second time you import the file do not
-        check any circle and in the second to last column, change URL to
-        none and then click next. Use the same name you used the first
-        time but add -Flag to it.
-=======
     saplus
 
         This format is for Street Atlas USA 2004 Plus.  
@@ -512,9 +495,8 @@ THE FORMATS
        http://www.visualgps.net/VisualGPSce/default.htm
        http://www.gpsu.co.uk/
        http://www.kolumbus.fi/eino.uikkanen/geoconvgb/index.htm
+       http://www.commlinx.com.au/GPS_recorder.htm
 
->>>>>>> 1.56
-       
 DATA FILTERS
 
        GPSBabel supports data filtering.  Data filters are invoked from

diff --git a/gpsbabel/mingw/wintesto.cmd b/gpsbabel/mingw/wintesto.cmd
index 2479855210b4a45b3d8286725643a539085d3e5c..01fcf8df8608aeb0929668268524e9129d222153 100644 (file)
--- a/gpsbabel/mingw/wintesto.cmd
+++ b/gpsbabel/mingw/wintesto.cmd
@@ -216,14 +216,14 @@ DEL %TMPDIR%\topo.mxf %TMPDIR%\tpg.mxf %TMPDIR%\geo.tpg
 CALL :COMPARE %TMPDIR%\tpg.mxf %TMPDIR%\topo.mxf\r
 \r
 REM OZI (OziExplorer 1.1) file format\r
-DEL %TMPDIR%\oz.ozi %TMPDIR%\ozi.ozi\r
+DEL %TMPDIR%\oz.wpt %TMPDIR%\ozi.wpt\r
 @echo on\r
 @echo Testing...\r
-%PNAME% -i ozi -f reference\ozi.ozi -o ozi -F %TMPDIR%\oz.ozi\r
-%PNAME% -i ozi -f %TMPDIR%\oz.ozi -o ozi -F %TMPDIR%\ozi.ozi\r
+%PNAME% -i ozi -f reference\ozi.wpt -o ozi -F %TMPDIR%\oz.wpt\r
+%PNAME% -i ozi -f %TMPDIR%\oz.wpt -o ozi -F %TMPDIR%\ozi.wpt\r
 @echo off\r
 @echo.\r
-CALL :COMPARE %TMPDIR%\ozi.ozi reference\r
+CALL :COMPARE %TMPDIR%\ozi.wpt reference\r
 \r
 REM Holux support is a little funky to test.  Becuase it loses precision,\r
 REM if we convert it to another format, we lose accuracy (rounding) in the\r
@@ -365,7 +365,7 @@ REM
 DEL %TMPDIR%\mps-track.mps\r
 @echo on\r
 @echo Testing...\r
-%PNAME% -t -i mapsource -f reference\track\mps-track.mps -o mapsource -F %TMPDIR%\mps-track.mps\r
+%PNAME% -t -i mapsource -f reference\track\mps-track.mps -o mapsource,mpsverout=3 -F %TMPDIR%\mps-track.mps\r
 @echo off\r
 @echo.\r
 CALL :COMPARE %TMPDIR%\mps-track.mps reference\track\r
@@ -373,7 +373,7 @@ REM Now do a test of reading waypoints from a track-only file - should have an e
 DEL %TMPDIR%\mps-track.mps\r
 @echo on\r
 @echo Testing...\r
-%PNAME% -i mapsource -f reference\track\mps-track.mps -o mapsource -F %TMPDIR%\mps-track.mps\r
+%PNAME% -i mapsource -f reference\track\mps-track.mps -o mapsource,mpsverout=3 -F %TMPDIR%\mps-track.mps\r
 @echo off\r
 @echo.\r
 CALL :COMPARE %TMPDIR%\mps-track.mps reference\mps-empty.mps\r
@@ -393,7 +393,7 @@ REM Now do a test of reading tracks from a route-only file - should have an empt
 DEL %TMPDIR%\mps-route.mps\r
 @echo on\r
 @echo Testing...\r
-%PNAME% -t -i mapsource -f reference\route\route.mps -o mapsource -F %TMPDIR%\mps-route.mps\r
+%PNAME% -t -i mapsource -f reference\route\route.mps -o mapsource,mpsverout=3 -F %TMPDIR%\mps-route.mps\r
 @echo off\r
 @echo.\r
 CALL :COMPARE %TMPDIR%\mps-route.mps reference\mps-empty.mps\r
@@ -574,7 +574,7 @@ REM Uses mapsource as the empty handling for this has already happened above
 DEL %TMPDIR%\psit-wr.mps\r
 @echo on\r
 @echo Testing...\r
-%PNAME% -r -i psitrex -f reference\psitwpts.txt -o mapsource -F %TMPDIR%\psit-wr.mps\r
+%PNAME% -r -i psitrex -f reference\psitwpts.txt -o mapsource,mpsverout=3 -F %TMPDIR%\psit-wr.mps\r
 @echo off\r
 @echo.\r
 CALL :COMPARE reference\mps-empty.mps %TMPDIR%\psit-wr.mps\r
@@ -594,7 +594,7 @@ REM Uses mapsource as the empty handling for this has already happened above
 DEL %TMPDIR%\psit-rt.mps\r
 @echo on\r
 @echo Testing...\r
-%PNAME% -t -i psitrex -f reference\route\psitrtes.txt -o mapsource -F %TMPDIR%\psit-rt.mps\r
+%PNAME% -t -i psitrex -f reference\route\psitrtes.txt -o mapsource,mpsverout=3 -F %TMPDIR%\psit-rt.mps\r
 @echo off\r
 @echo.\r
 CALL :COMPARE reference\mps-empty.mps %TMPDIR%\psit-rt.mps\r
@@ -614,7 +614,7 @@ REM Uses mapsource as the empty handling for this has already happened above
 DEL %TMPDIR%\psit-tw.mps\r
 @echo on\r
 @echo Testing...\r
-%PNAME% -i psitrex -f reference\track\psittrks.txt -o mapsource -F %TMPDIR%\psit-tw.mps\r
+%PNAME% -i psitrex -f reference\track\psittrks.txt -o mapsource,mpsverout=3 -F %TMPDIR%\psit-tw.mps\r
 @echo off\r
 @echo.\r
 CALL :COMPARE reference\mps-empty.mps %TMPDIR%\psit-tw.mps\r